From fe48bc284845397551ac9ae7b75e3d43c427d15f Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Mon, 24 Oct 2016 12:02:46 -0500 Subject: [PATCH] Drop emacs23 icons to avoid future path conflicts Thanks to Tatsuya Kinoshita for reporting the problem. Closes: 841687 --- debian/rules | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/rules b/debian/rules index 8171720a5ca..38696d2076a 100755 --- a/debian/rules +++ b/debian/rules @@ -438,6 +438,14 @@ override_dh_auto_install: $(autogen_install_files) cd $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/images/icons \ && convert hicolor/32x32/apps/emacs.{png,xpm} + # Remove emacs23 icon versions + cd $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/images/icons \ + && rm hicolor/*/apps/emacs23.* + cd $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/images/icons \ + && rm hicolor/*/mimetypes/emacs-document23.svg + cd $(pkgdir_common)/usr/share/icons/hicolor/scalable/mimetypes \ + && rm emacs-document23.svg + # Fixup image files in unversioned directories (version # unversioned images) and prepare for update-alternatives. cd $(pkgdir_common)/usr/share/icons/hicolor \ -- 2.30.2